Auto merge of #4517 - durka:patch-7, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 21 Sep 2017 03:36:14 +0000 (03:36 +0000)
committerbors <bors@rust-lang.org>
Thu, 21 Sep 2017 03:36:14 +0000 (03:36 +0000)
commitfdf0babb2154d41335845f64930f222910c03296
treedbaba2b90564eef701b3d65ffd13cd55f1e6dae7
parent31dd4e37d819c7eeb13388f8d92165c93cef5e9b
parent9e560a7a25fbeeab7baa9c7013cad36020708f27
Auto merge of #4517 - durka:patch-7, r=alexcrichton

[patch] slipped to 1.21, mark 2

Same as #4513, apparently it showed up in a few places.